Manual Merge, A lot of syntax error