Fixed wrong merge