tests create
fix merge conflict