Use Sublime 3 on Ateles.
Fix conflict.