Merged those changes, I assume you wanted the ones from the remote