Final merge for sprint 1