actually working remote/local merge
edited the diff stuff away and tested