course message -> fixing merge error