Removed auto merge dev;
Changed vim to sublime