Resolve merge conflicts with hackathon1