conflicts gedit
