Done
Done fixing conflicts and reformatting