fix sources - bad merge day