clean code for merge