added conditions tryin to merge