cleand up merge conflict