resolving conflicts
yeah working awesome dude