fixed some merge conflicts that were sitting in the cloud