FIXED merge errors