Changed indent size from 2 to 4
Resolved conflict