Robot...
Robot changes + conflict resolved (stop commenting all my non-functional code and commiting it nikolaj!!) :(