manually updated the master branch files; guess the merge was too much, and it kept rejecting it