unfinished merge fixed