MERGE COMPLETE, gradle errors might appear..