fixing merge resolution conflict