fixed last error merge