End of first Friday hack
Fixed conflicts