Fix maven, sublime text, todo.txt
Fixed merge conflict