Removing stupid header thing from Git conflict.