Please merge carefully, and do not commit git merging lines :D