Fixed merge conflict messages in specfile