Merge "Remove excess entry before putting new item" into main