Fixing unfinished merge