cleaning up code
fixing conflicts