merged file from work with that on remote git. Will then commit this to remote and begin working on it at home