resolving merge conflicts
merge conflicts RESOLVED unlike the middle east
fix merge conflicts