Fav character is Homer Simpson
manually edited merge conflict file will this work