Merging the accidental commits