Conflicts resolved.
Removed something not belonging to this branch.