Conflict editor text changes have their own package

They are now mostly useless and they just made the package explorer
hard to read.
Replaced strings with constants and enums
formatting and imports