Formatted. Fixed merge errors