solving conflicts with eclipse editor :s