Fix merge conflict handling and message, remove pusher
My first test (c)(r)