Stuck, waiting for push
Merge conflicts
Adding file works