Removed phpstorm metadata from rep
Fixed conflict