solved merging error (stupid)