Adding to feature task
changing merge options
Added branch name to merge command
Added test task
Added test tasks