another test file
remove unused trim
extra spaces block test
resolve conflict
use rename