According to Eclipse I have editied something.
Merge remote-tracking branch 'origin/master'