discard changes in master as they are silly