updating after merge