different stuff
remerging with older files
fixing merge issues