starting work on my project
merging