messing aroudn with merge conflicts now