some un-pushed edites
merged uncommitted changes