merge with oscar conflicts fixed