firs tinit
fix merge