Change how repositories are pulled down to remove warning messages. Also changed how merges are handle to reduce likelyhood of conflict