something is weird between branch and master