[AD, RD] {merge} files added (eclipse killed on merge)