init commit
conflit fixed