fixed colon
merging stuff