Fixing weird overlap problem
conflict resolution