Asa

Am I merging correctly?