Fixed file conflicts (hopefully)