Removed accidental inclusion of merge content