test after merging conflict solved