almost there...
almost there.. again
MERGE COMPLETE, gradle errors might appear..