fixed wierd conflict error