Clean the mess after failed merge. See commits 6902750bf95606aa9613b9dd00aec91d192e140b, b7bb124379dd249f4253f0dbfa764a4f75d94df3 and 460a47f5ccf8193a4a85a042576d6f83c47d766f