cleanup confliction after merge