Resolved merge conflict
updated .gitignore to ignore sublime cache