sample file has included /**/
conflicts fixed